placed cleaned up code in src