Updates and code style fixes

TODO: Fix issue with generated docs