Fixed formatting errors and parse complexity