Clean Code

05/06 Before upload to ec2