Refactors last bits before first release