improve code readability, fine tuned little things