Refactored formatting and issues based on CheckStyle