Cleaned up Controller a bit.