Clean up code & docs