Clean up + documentation