Styling and usings cleanup