Cleaned code up a bit, removed scripts from setup