Cleanups e refactors gerais