Feature/cleanup and convention