Removed printing
Added custom query method
Whitespace