Clean Up and naming convention