Fixed formatting & cleanup