Added files, refactored properties updated comment style