Ruby style and cleanup
Format code to under 80 columns