cleaned code, ready for variables