Clean up to N200 code

Cleaned up the GRC file and minor changes to the functions