Changes + cleanup:

- Changed MaybeT (State s) to StateT s Maybe
- replaced Map.! by ! (clearer)