Changed some stylistic features and did some de-bugging.