General Code Clean Up