Cleanup + some changes + documentation