Little bit of formatting and optimizing