General code cleanup

Added pragma marks, deleted extra spacing.