Bit of code cleanup and fixed a bug that lead to an empty result