Cleaned up the code a little ( #7 ) while started preparing seen module ( #9 )