Cleaned up angular code a bit.
Prettied things up a little.