Changed variables, cleaned code.