Added int Color constructors
Fix alignments
Remove duplicate code