Cleaned up a bit
Fixed module paint