cleanup & reducing redundancy