Code Tidy

Little house cleaning on the code