Note: Start beatify and structure code more logically