Cleanup code a little
more transparent, just play around