Fixed comments on the pull request

Summary:
	-Removed spaces between methods and the arguments
	-Use when on all contexts
	-Refactor all context that need special variables to use before/after each
	-Removes NSLogs
	-Corrected typos