Code Restruture and JavaDoc comments
Fixed fxProperties list initializer