OSS Friday hell yeah!

Done a bit code gardening :)