Formatting changes

Changed tabs to spaces and removed the comments (for now)