minor style changes
Deleted incomplete files to be included in later branch