removed some pointless FRC comments, organized imports