Code Tidying

Changes some code to look cleaner.  Removed unncessary lines.