Changedd Colouring
Cleaned up file