Final tweaks
Adding haddock comment