Refactored and cleaned up; coloring still disabled