cleanup old solution, consistently move type hint to method invocations, minor style updates