Code clean, optimize code