Added cylinder geometry, clean up some codes.