Making code more read-able