Cleaned up spacing, comments.