Beginning code cleaning