More efficient query
Clean up code
nothing major