reduce the TODOs in Main.java and SAMCL.java