Attempts to fix Visual Format Language &  refactoring of code