Cleaned up the code...consistent spacing, etc.