Conditional Personal

Cleaning up my code