Code/Project clean up