Code Clean up v1