Some style changes
Remove deleted files