Code Refactor!
Re-Checking all code for readability and strictness to code standard.