Cleaned top-module

See #52
More cleaning