Modified PopSong.java

Cleaned up code, used this/super.