Organized functions a little better, more comments and semicolons