Tidying, optimizing, still horribble