Cleaned up code, adjusted some commenting. Stylizing.