Added Comments, Updated id names

Added comments and updated id names for better readability