Feature/minor cleanups