Final style fixes & removing brackets I missed