Some documentation + Clean up