Some cleaning up + docs