Breaking out classes, fixing brightness to an extent