Refactoring PMF + added Utils + style mess