adding contrast effect + refactoring