minor formatting and removing NSLogs