Refactor: Remove used variables and import statements
Fix CRLF and Refactor: Add comments/update formatting