Remove unused locals and reformat majik numbers