Added hide marker and cleand the code