[CLEANUP] - Additional ignore rules and whitespace fix