improve performance
general cleanup