Reorganized and added polish