Variable nouns + more structures

Also made code slightly more readable.