Added comments/finalizing/cleanup