Code Clean up part 2