Cleaned code up on index page