Cleaned up code, finalized .jar file.