Refactored Common.java even more