General cleanup and reverted back to build popup notification for scores