Cleaned code and moved bits and bobs.