V 1.0 - Clean up code