[MOD] comments + cleanup, naming consistent with thesis