Code simplification
Simplify code; Junits