Added some amazing code style fixes - 2.