Updated comments and added some fancy colours ;)