Spring Clean up

Signed-off-by: estebansanti <esteban@pixelban.com>
Cleanup

Signed-off-by: estebansanti <esteban@pixelban.com>