Add comments and create utils file