Removed dependency on java.awt.Color
Minor fixes and code cleanup