Refactorings, code cleanup, added alpha channel to colors