Added php54.pp & code cleanup