Documentation and stylistic changes
Re-thinking some stuff