Started making actual content, cleaned code