Source ignore & Improved coding style