V1 Final

code cleanup