File structure + cleaned syntax up a bit