Adding comments and finalizing code