Move vectors to instance variable
Add some docs, cleanup some more