Change colours, remove redundant code