Cleans code
Updates schema