Functionality Works

Some style remarks