Clean code & add main page