Make the code proper
Make the code proper