cleanup naming/typing/bugfix