Organized code, removed useless variable, implemented screen overrides