Code clean up.
Code clean up.

damiensawyer/cassette,damiensawyer/cassette,andrewdavey/cassette,andrewdavey/cassette,andrewdavey/cassette,BluewireTechnologies/cassette,honestegg/cassette,honestegg/cassette,BluewireTechnologies/cassette,damiensawyer/cassette,honestegg/cassette