Uzair Rivera: clean style

Breaking