Adds tools to simplify procedure
Cleanups and small modifs