Moved methods around and changed variable names for consistency.
Moved methods around and changed variable names for consistency.

chamakits/Java-FOPL,recardona/Java-FOPL,recardona/Java-FOPL,chamakits/Java-FOPL