No more redundancies in code