Small cleanup pre first release