Code cleaning up
User module in process