Clean up, fix org class