More code cleanup

Making it more readable