Changed some things and cleanup