Reorganized and commented stuff out