Cleanup of code

Added some more meaningful names - but this is work in progres.