Improve code readibility