Reformated some code to make it more 'pleasant' to the eye :).